From 418a348befa8607d0d69a4ffffe5f31fce128578 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 10 Jul 2008 16:37:53 +0000 Subject: [PATCH] fix a segfault in the a11y code svn path=/trunk/; revision=20813 --- ChangeLog | 7 +++++++ gtk/gtkiconview.c | 11 ++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c763940cf..5774a751b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-07-10 Matthias Clasen + + Bug 542234 – iconview a11y implementation segfaults + + * gtk/gtkiconview.c: Fix a segfault in the a11y code. + Patch by Li Yuan. + 2008-07-08 Christian Neumair * gtk/gtkuimanager.c (update_node): diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 792d65c619..b71004c23b 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -8970,8 +8970,8 @@ gtk_icon_view_accessible_model_row_deleted (GtkTreeModel *tree_model, { if (tmp_list == NULL) tmp_list = items; - else - info->index = item->item->index; + + info->index = item->item->index; } items = items->next; @@ -8981,11 +8981,8 @@ gtk_icon_view_accessible_model_row_deleted (GtkTreeModel *tree_model, { info = deleted_item->data; gtk_icon_view_item_accessible_add_state (GTK_ICON_VIEW_ITEM_ACCESSIBLE (info->item), ATK_STATE_DEFUNCT, TRUE); - } - g_signal_emit_by_name (atk_obj, "children_changed::remove", - index, NULL, NULL); - if (deleted_item) - { + g_signal_emit_by_name (atk_obj, "children_changed::remove", + index, NULL, NULL); priv->items = g_list_remove_link (priv->items, deleted_item); g_free (info); } -- 2.30.2